From 8ed27d6e3bcfafb6fdf64dfabd0a978cd1cd984a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 29 May 2019 15:21:20 +0000
Subject: [PATCH] Drop gdk_surface_move

And its cousin, gdk_surface_move_resize.
These APIs are expecting global coordinates,
which are going away. GTK is not using them
anymore.
---
 docs/reference/gdk/gdk4-sections.txt |  2 --
 gdk/gdkinternals.h                   |  9 +++++++++
 gdk/gdksurface.c                     |  9 +++------
 gdk/gdksurface.h                     | 11 -----------
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index c2b2598989..d2860d37c1 100644
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -207,9 +207,7 @@ gdk_surface_set_fullscreen_mode
 gdk_surface_set_keep_above
 gdk_surface_set_keep_below
 gdk_surface_set_opacity
-gdk_surface_move
 gdk_surface_resize
-gdk_surface_move_resize
 gdk_surface_move_to_rect
 gdk_surface_raise
 gdk_surface_lower
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index e23a33338f..8bed38199b 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -266,6 +266,15 @@ void gdk_surface_get_geometry (GdkSurface *surface,
                                gint       *width,
                                gint       *height);
 
+void gdk_surface_move         (GdkSurface *surface,
+                               gint           x,
+                               gint           y);
+
+void gdk_surface_move_resize  (GdkSurface     *surface,
+                               gint           x,
+                               gint           y,
+                               gint           width,
+                               gint           height);
 
 G_END_DECLS
 
diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index ba4c73a72f..7c9c76b6a5 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -2053,7 +2053,7 @@ gdk_surface_move_resize_internal (GdkSurface *surface,
 
 
 
-/**
+/*
  * gdk_surface_move:
  * @surface: a #GdkSurface
  * @x: X coordinate relative to surface’s parent
@@ -2087,10 +2087,7 @@ gdk_surface_move (GdkSurface *surface,
  * use gtk_window_resize() instead of this low-level GDK function.
  *
  * Surfaces may not be resized below 1x1.
- *
- * If you’re also planning to move the surface, use gdk_surface_move_resize()
- * to both move and resize simultaneously, for a nicer visual effect.
- **/
+ */
 void
 gdk_surface_resize (GdkSurface *surface,
                     gint       width,
@@ -2100,7 +2097,7 @@ gdk_surface_resize (GdkSurface *surface,
 }
 
 
-/**
+/*
  * gdk_surface_move_resize:
  * @surface: a #GdkSurface
  * @x: new X position relative to surface’s parent
diff --git a/gdk/gdksurface.h b/gdk/gdksurface.h
index c93b3edba4..55660ed9a6 100644
--- a/gdk/gdksurface.h
+++ b/gdk/gdksurface.h
@@ -445,22 +445,11 @@ GDK_AVAILABLE_IN_ALL
 void          gdk_surface_hide                  (GdkSurface     *surface);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_show_unraised         (GdkSurface     *surface);
-
-GDK_AVAILABLE_IN_ALL
-void          gdk_surface_move                  (GdkSurface     *surface,
-                                                 gint           x,
-                                                 gint           y);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_resize                (GdkSurface     *surface,
                                                  gint           width,
                                                  gint           height);
 GDK_AVAILABLE_IN_ALL
-void          gdk_surface_move_resize           (GdkSurface     *surface,
-                                                 gint           x,
-                                                 gint           y,
-                                                 gint           width,
-                                                 gint           height);
-GDK_AVAILABLE_IN_ALL
 void          gdk_surface_move_to_rect          (GdkSurface         *surface,
                                                  const GdkRectangle *rect,
                                                  GdkGravity          rect_anchor,
-- 
2.30.2